[PATCH 02/02] Kexec / Kdump: Don't declare _end

_end is already declared in xen/include/asm/config.h, so don't declare
it twice. This solves a powerpc/ia64 build problem where _end is declared
as char _end[] compared to unsigned long _end on x86.

Signed-Off-By: Magnus Damm <magnus@valinux.co.jp>

diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index f3f5f017316782a073293a56f7c66137464e70e7..2f8b8e0de36b7d9b66f7db123dc32f99dd8ff170 100644 (file)
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -158,7 +158,7 @@ static int kexec_get_reserve(xen_kexec_range_t *range)
     return 0;
 }
 
-extern unsigned long _text, _end;
+extern unsigned long _text;
 
 static int kexec_get_xen(xen_kexec_range_t *range, int get_ma)
 {
@@ -167,7 +167,7 @@ static int kexec_get_xen(xen_kexec_range_t *range, int get_ma)
     else
         range->start = (unsigned long) &_text;
 
-    range->size = &_end - &_text;
+    range->size = (unsigned long)&_end - (unsigned long)&_text;
     return 0;
 }